Fixed some missing linkages, removed some unused stuff