Removed duplicity code