Remove more code.
Remove more