Cleaned up cruft