#62 and #63 -- Removed obsolete tables and SPs, sync DB and code