Fixed obsolete blocks in icity.xml