Some cleaning up :bathtub: