find bugs clean up