Fixed some hadoop issues, removed AWS specific code.