Removed unnecessary code and semantics