Removed un needed files and clean up code a bit.