Cleanup: removed unused funcs and fixed a comment