Adding inline notation into other controllers. Removing not needed dependencies.