Remove junk
Fix issue #1