Cleaning up left overs