Removed cruft and decided on simple lightweight architecture