Properly remove no longer used classes