Removed unused methods and other stuff.
Added reminders for myself. Btw, committing this before trying to use
branches.