Remove unnecessary app push
Clean up domain helpers