DB Updates and cleanup