Remove some of my stupidity