Further cleanups
1 file changed