Schema cleaned