Removing more unnecessary things