[PATCH] remove cut'n'paste code paths