Further clean up platforms