Removing old architeture