removed unneeded libraries, and moved moment out