Clean up service package to Report related and remove Insert/update/delete operations