Remove old fixes