Removed useless dependencies and added required roles