remove unnecessary services and small errors