cleaned up delegation
cleaned up delegates