All removes now working