Removed extra parser