Remove more noise & duplicates

Issue #38