Removed several deprecated files