Fix errors, delete bootstrap