CLEANUP: improve comments, remove unused methods.