Major cleanup, steam runtime support