Removing ids
Fixing merge issues
Further removing ids and fixing up class handlers