Removing methods that were not needed