Restore commented out code
Optimize UserConsentDao by removing unused methods