Make fit for RC1: Del not used xml, remove debug settings