remove obsolete stuff from master branch