Fixing some comments and removing unnecessary files