Removed some notes to self and commented out code