removing a bit of crap
Merge branch 'stage'