Cleaned up some leftover code.