Remove commmented code