got rid of unnecessary class