Removing some unnecessary things