Cleaned out unused classes