chore($q): simplify the promises resolution code

Simplify the promises resolution code
Remove commented code