More cleanup, shrank package size from 981.8 to 949.6 MB, ready for 0.0.2