Remove initial mockup
Migrate to killable from interruptible