removal of some testing code