Cleaning a few things