updated code base

Deleted unused class
Added validations