Getting started cleanup