Removing old sub instances code