Formatting
Remove dupe import
Remove unused methods
Remove un-used find logic
Remove unused methods