First hack-and-slash cleanup.