Clean up Entity and Queryable trait