Cleaning up as per flake