CLEANUP: removed comments