Deleted unnecessary method-calls in Class Control