Cleanup, remove unused files.
Remove warnings