clean up and update to latest boostrap version