cleans up challenges, ready for #6