Removed defunct using