deleted all usage of challenge classes