Commented out and changed more database calls that aren't relevant