Removed some unesseccary stuff from these files