purge empty file
more general cleanup and comments