got rid of useless classes