Remove obsolete lines
Add support for l2asize