Remove file

   - fix #5; for issue 1
   - fix #6; for issue 2