removed a couple of unneccessaries