+sampleApp cleanups