Feature/cleanup non ft words