Squashed EventManager commented out thing I don't need anymore.