fix for remove + tidy up