dead code removal and simplified service creation