Bolt 2 clean ups