Gets rid of some warnings and unused files