remove postgres logic, change storage method