Removed cruft, final edits for prototype