kicker: some cleanup