Cleanup of setup