removing some of the advanced stuff - for now...