Removal of Self-Reporting Requirement