Cleaning up Bounce