remod unnecessary stuff