More cleanup
Fixed warnings
More warnings fixed
Removed local files from git