DB Scripts cleaned