Made some changes for removing subjects