Speed up db, reduce some complexity