removing some testing code and comments