Remove SQL generation code - should be in SQL package