removed calendar and moved utils out