Clean up utils and move some stuff from it into Application