Remove code that has been pointless since 2009