Remove hard-coded classname frokm Tyrell project