Remove unneeded and outdated classes