Remove commeted code