Fixed Cost Basis field and removed legacy portfolio code