cleaning up to fit with latest dev version or orion