lib: sport: cleanup code