Remove old features we just removed.

Issues affected:
	#2