Removing deadcode