controller update - old code cleanup