Clean up Express structure