Removed a few things that weren't needed