Cleaned up some unused fields