Clean everything up in terms of my new vision