Second round of gutting Flexlay, simple/ compiles now