cleanup & bootstrap 3.3