Remove delegate code, remove hacked classes code