Removed FIXME associated closed #122 - not needed