removed some dead code, made a few notes for myself