RAPI: Clean up instance creation, use generated docs