Removed two unneeded functions