fixed unused fields removing