Remove solved issues 461