[CF-340/cf-343] Minor fix to remove unwanted code
Merge pull request #17 from ChandraAddala/cf340-cf343-cleanup-schema

[CF-340/cf-343] Minor fix to remove unwanted code
merge with Chandra's changes