removed more dependencies in Points.java
resolved conflicts in Points.java