removed obsolete code. Still on feat_obsolete branch for now