major clean up to swverify