Removed unused fields and some house keeping