cleaned up demo/lib