Removed files and fixed bugs