remove maruku dep; remove unused liquid code that was causig problem
merge conflicts