removed unnecessary operations (still requires review)