Removed dead procedural code

Change-Id: If3c59c0aa3e5ff8a4f319ba30a8bff7245005209
Merge "Removed dead procedural code"