some cleanup, relinking demo