lint/test cleanup