Remove all never deleted functionality