Remove more express boilerplate code