cleanup for new boostrap features