Removed definitions which weren't being used