A bit o' cleanup
Some cleanup, removal of unused (?) file
deleted all crazy, repetitive actions