Committing latest changes - removing invoicing/receipting for now