Removed a few things