fix review issues
fix review issues

remove unused require
filter tenant list only once
remove unneccesary _.each call

Orodan/Hilary,nicolaasmatthijs/Hilary,nicolaasmatthijs/Hilary,simong/Hilary,mrvisser/Hilary,timdegroote/Hilary,Orodan/Hilary,jfederico/Hilary,stuartf/Hilary,mrvisser/Hilary,timdegroote/Hilary,stuartf/Hilary,jfederico/Hilary,simong/Hilary