Remove more obselete code