Remove unsed directories, other bootstrap script cleanup