Basic schema cleanup