Big cleanup, that's a 1.0!