removed cruft, keep it simple