Removing some code that we don't need anymore