remove Flick duplication