Dev platform 308 cleanups