Removing a couple unnecessary things