Sudhir: removing unneeded implementations and using apache commons stop watch