6e9e891 Cleaned up deprecated files