Remove unused imports
Add a point type