Merge "Removed dependency from lombok"