Removed not needed Strings and NPE