Removal of unwanted commented out function calls.
Adding null callbacks