Cleaning up erroneous $1 and $2