don't overwrite changes to db
remove remnants of code gone past
Merge remote-tracking branch 'origin/develop' into develop