removed warnings and extraneous printks