Cleanup

Cleaned up base files