Reformat
Remove one large trunk of useless code
More code janitoring
Feature filtering