Remove unused dependency
Remove unused rest points
Clean up comments