Code cleanup
De-deprecating hidden attribute
NPE avoid with error log
Unused throw
Added log message, to notify about target method
Simplified
Wrong class modifier