Remove parse tags

also fixes word boundary in regex