Remove pass-through constructors, cleanup service initialization