Removing unused method
Merge branch 'testcases' into develop