remove unsued code, prepare master to dev