Removing unused comments and move functions