Removed cruft, keep it simple.