fix return issues remove methods