Updating/fixing + removed old java code + suppressed some warnings.