Todo later: Cleanup commented out code.