Feature/remove deprecated function