first commit
remove deprecated code