services cleanup

services cleanup