Move create-check to create function and add remove option