step 1 of optimizing data lookup
cleanup