file system cleanup, code cleaning