Cleanup. Redundant behaviour deleted. Renaming.