Cleaned up a few warnings and removed unused files