Cleanup as discussed