Cleaned up some leftover code from debugging