Cleaned up some junk