raptor-templates --> marko and other cleanup