diff --git a/alib2abstraction/src/abstraction/ValueProvider.hpp b/alib2abstraction/src/abstraction/ValueProvider.hpp
index 443a409ae4d839d70fdf06092c229803157d22da..82fc09159a4a98a07410303272530e087b53784b 100644
--- a/alib2abstraction/src/abstraction/ValueProvider.hpp
+++ b/alib2abstraction/src/abstraction/ValueProvider.hpp
@@ -57,10 +57,6 @@ protected:
 	virtual Type & getData ( ) const = 0;
 
 public:
-	Type & getValueReference ( ) const {
-		return getData ( );
-	}
-
 	Type & getValue ( bool ) const {
 		return getData ( );
 	}
@@ -75,10 +71,6 @@ protected:
 	virtual const Type & getConstData ( ) const = 0;
 
 public:
-	const Type & getConstValueReference ( ) const {
-		return getConstData ( );
-	}
-
 	const Type & getValue ( bool ) const {
 		return getConstData ( );
 	}
@@ -93,10 +85,6 @@ protected:
 	virtual Type & getData ( ) const = 0;
 
 public:
-	Type && getRValueReference ( ) const {
-		return std::move ( getData ( ) );
-	}
-
 	Type && getValue ( bool move ) const {
 		if ( move )
 			return std::move ( getData ( ) );
@@ -114,10 +102,6 @@ protected:
 	virtual const Type & getConstData ( ) const = 0;
 
 public:
-	const Type && getConstRValueReference ( ) const {
-		return std::move ( getConstData ( ) );
-	}
-
 	const Type && getValue ( bool move ) const {
 		if ( move )
 			return std::move ( getConstData ( ) );
diff --git a/alib2cli/src/environment/Environment.h b/alib2cli/src/environment/Environment.h
index 8a89257a0478c2c42959f1785e8a428e4e96f3cf..5279e44e077e31b5c396db340cace5f7af0df4bf 100644
--- a/alib2cli/src/environment/Environment.h
+++ b/alib2cli/src/environment/Environment.h
@@ -81,7 +81,7 @@ public:
 		std::shared_ptr < abstraction::ValueProvider < const T & > > ptr = abstraction::translateParam < const T & > ( getVariableInt ( name ) );
 		if ( ! ptr )
 			throw exception::CommonException ( "Invalid variable type. Requested: " + ext::to_string < T > ( ) + ", actual : " + getVariableInt ( name )->getReturnType ( ) );
-		return ptr->getConstValueReference ( );
+		return ptr->getValue ( false );
 	}
 
 	std::set < std::string > getVariableNames ( ) const {