Remove old commented pieces out [ci skip]