remove some cruft
couple of errant SQL queries
Merge https://github.com/friendica/red into zpull