Dev cleanup (FOR REVIEW ONLY)

Not ready to merge - just wanted to post this for review and discussion. A few more commits are needed to restore all functionality.