Fixes #9 and some previous file deletion