Refactoring old code

More like removing old code. Added some memento notes for myself in there.