Cleans up hamcrest cruft