Renamed mount and removed dead code