Removed dependency to Google Guava and rewrote corresponding code parts.