Remove obsolete lines and readme fix