Cleanup/beta prep

Beta 2 level code