Remove unneeded