Merge @gilbsgilbs PR #3 (painfully)
Remove uneeded files