testing code; cleanup