Remove unnecessary dependency, clean up file input element in directive template
Code clean-up