Removed unnecesary directives. Added underscore module