fixed delegate bug
Merge branch 'dev' into feat/profilePage
Comment out delegation methods