deleted stuff and minor changes
merge