Clean up and moving to sessions list properly.
Otto integrated, cleaned up stuff.