Cleaned up some cruft