Revert "sql changes"

This reverts commit d737fb5b5c655b0b0e36f7e1698462116094da6f.
Revert "changes"

This reverts commit f9faf5579923328ac5ce6f651130bc87503d1939.