Interface cleanup, removed preemtive architecturing