Add coordinate system.
Remove unused code.