Updated utility goal calculations

Also removed unnecessary .java's