Removing redundant files + bug fixes