Cleanup, added sessionstorage