Cleaned some backup code