Clean up un-used classes