cleaned up some cruft