Drop unused #includes

Change-Id: Ief545db58a0dbb26ba293aa71debc816a8925b6c
Avoid possible memory leaks in case of exceptions

Change-Id: I04a0a2c296206f155ee4916b15b853a7f10c2c2a