removed some uneccesary class