remove ssome stuff
merge from dev to testing