Fix #430 - Finial changes to remove unneeded logic