Fixme cleanup
Turf unused test support
Cleanup imports