continuing clean up