removing dependency on velocity and cleanup