almost 90% CC on frontend, removed unused methods