cleaning up some leftover code