Remove excess require / improve logging / test force flag