Removed shapeless and reworking AST and parser