Cleanup

removed useless variables, imports, etc

Signed-off-by: Ignacio Quintero <nacho950@gmail.com>