Removing unused hack