Comment cleanup, remove unused function definition