rm stuff now present only in ruben branch