cleanup code after after url bug fixed.