Massive cleanup of NEIObject