Remove scaffolding to create the production branch
Fixed an ARC issue highlighted by the static analyser