No more last minute cleanups before I commit