clean up cruft / fix all warnings