regarding the removal of the discipline section please see here