Remove redundant includes and empty lines

According to the comments of @psychocoderHPC I removed some unused code lines
and some double or unused includes.