Cleanup commented out code 3 and minimize includes