removed calculator class
removing more legacy code
removed more legacy code
removed more legacy code

removed unused call to motion type (walking vs. vehicle)