Removing unused classes from Library

Change-Id: I9397271ee485b0f04f64da1fb8582a9910160ba3
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Merge "Removing unused classes from Library" into topic/schema