Removing unused includes/local variables

Also ran Eclipse's "Fix indentation" tool on all the files