more cleaning, removed unused parameters