Remove anything not needed for test