Fixed an issue with the parameter delete. Note: Too many if checks?