Remove commeted/useless code