This commented code should also be gone?