Revert previous commits and fix issues imports