Remove un-used commented code