Sort out production build

Sort out production build