Cleaned up repository in preparation for Bootstrap revisal.