Remove dead code

Change-Id: Id8c1ad7c34682751a914bdc6e4ee856666135855
Reviewed-by: Orgad Shaneh <orgads@gmail.com>