Remove commented code if not relevant