Cleanup based on express docs.