removed things marked 'old'. VC means we dont need them