clean up and more entries