Challenge framework, removed game redundancies