cleaned redundant services and model classes