Some clean-up in anticipation for client development