Removing old function call, updating comments