converted to all local storage and cleaned up