Removing old base code