removed unnecessary comments and traces