Cleaned unused classes