Remove unnecessary code

Change-Id: Ieb31bb38459f8b579d841697253d37e0b44ed554
Signed-off-by: Ashish Singh <ashish.singh@sap.com>
22 files changed