Removed unneeded code and fixed the move from coordination cluster to theme