In 1930 the property returned to the ownership of The Merchant Company, who used nearby playing fields for George Watson's College, which was soon itself to move nearby. Then in 1935 the tower passed to Edinburgh City Council. It remained unoccupied (except for war service) until 1956, when it was suggested as the centrepiece of a new technical college. Restoration work began in 1958, highlights of which were the discovery of the entrance drawbridge and the preservation of a seventeenth-century plaster ceiling.