Tidying dev_5/develop only section