Tidy up of build targets prior to snap ci setup