[Fix #280] Remove references to