Remove obsolete syntax and so on