More cleanup
No need to pass null to methods which doesn't take arguments