removed a few things that do nothing