Updates to platform to remove unnecessary code from implementation/instantiation