Finally, ultimate promise hack

Stop duplicating code, start using finally method in promises