Properly removed jsr305