Cleanup. Thanks Andres and Levente.
ups