Removed code to Provider class and controllers