Cleaning up entries