#134 Removed unnecessary changes