Remove creates, need better verification