Cleaning

Leftover code deleted. Other small changes.