Cleaning up docs & demos