Cleanup of old commented-out code and outdated variables.