cleaning up the OOB app generation stuff.