Revert "Adding new Scheme Support"

This reverts commit 30c46435caa4224b989e0f822020df0b29b21582.