Cleanup of Remove Object pkt
Added override and final makro