Cleaned up some deprecated files