Require delta definition during runtime, more cleanup too