Remove more code