please remove all unused/commented out code