Clean some unnecessary code that was written before merge with develop.