NAWQAAN-44

* Deleted unused files
* Cleaned up after merge
NAWQAAN-44

* Noticed we were trimming too many columns