Remove enabled handling from Application
Rename onEnabled to restart in Controller and tests