Clean-up and preparation for first consumer implementation