Tidying up Organization handler
Removing references to cheques