Remove immediate start feature, reorganize code