[EDIT][DELETE] Old sql's and reestructure