preos cleanup

as requested on irc