Cleanup commented funcs