Removed unnecessary comments and functions that were no longer being used