Remove old styles + cleanup