removed a few things