some minor fixes and delete all