Fix : Removed some duplicate class that caused addon register /
unregister to fail after previous commit