removing old statements and some changes