cleanup leftover code