Removed silly bootstrap logic