New controllers, deleted old ones