Added ontap
Cleaned up after bootstrap installation