added operators objects, removed unused code