Moved challenge maintenance to challenge_detail view
Removed obsolete code
Resolved conflicts