Some more code that isn't necessary anymore