This patch removes first chunk of duplicated code