remove ServiceHandler stub classes