removing 'shapes' from parser