Cleanup of bypass demo