fixes and removes