Cleaned up schema / old db tables