cleaned up cruft