Fix indent and remove lagacy stuff