Tidy up for deployment