Remove commend out code