Clean up of previous commit [squash me]