Removed out of date classes