Code cleanup
Added missing DeProxify to database lookup
Removed faulty unique constraint when altering columns