Delete commented crap & unused methods