Interface cleanup for 1.0 release