Revert "Minor Interface changes"

This reverts commit ac03afdb21ba12b0956ab7c647d0d2790b565016.
Fixed more merge errors