Remove wrapper and comments