Remove session id
Clean up instrumentation code.
Better line errors.
Clean up edit listener.