Remove adhoc non-tests