refactor($q): make $q Promises A+ v1.1 compilant

Refactor to make $q Promises A+ v1.1 compilant
this strikes me as unnecessary, we shouldn't need to wrap these functions to prevent them from being called twice