- Cleanup include and lib dir to free space
- Fix cleanup