* cleaning up cruft