revert code; remove tests