Cleaning up docs and demos