Remove deprecated code,  some div changes