Dev platform 308 cleanups

@macbre — PLATFORM-308 cleanups and limited logging