Removed branch comments, debugging fmt's and unused packages