more cleanup, ready to create resources