Removed excess files and shaved a bit of code.