removed singleton list class and cleaned up cell