Fixed left association of function calls
Removed unused class