Removed unnecessary code for unit tests