Removed unavailable services

This removes services which are not available any more, resulting in failed tests.