Got rid of stale code; got rid of most compile-time warnings