ENH: removed comments, unused methods