Fixes to work with the updated libraries
* Using a hacky JQL delete statement to get around the bustedness in my mappings; too tired to fight it out.