Remove alter statements, close #836 #837