Platform cleanup
patch to commit branch