Cleanup of Model, Store and FrontController