More cleanup.
Remove more unused files, fix some warnings, fix formatting