Cleaned up some dead code