(#115) - Remove no longer necessary code