Rename function. Remove commented out line