Clean up Queryable traits