Fixes and removes