Don't create apache user. And tidy up old define.