Fixes for sonar issues. Mainly removing redundant throws
fix purge for CategoryResoure
fixing major sonar issues