clean up creation logic