diff --git a/api/src/com/cloud/network/IpAddress.java b/api/src/com/cloud/network/IpAddress.java
index fce8f38c2f2..71c9b4e0bf3 100644
--- a/api/src/com/cloud/network/IpAddress.java
+++ b/api/src/com/cloud/network/IpAddress.java
@@ -78,16 +78,7 @@ public interface IpAddress extends ControlledEntity, Identity, InternalIdentity
 
     boolean getSystem();
 
-    /**
-     * @return
-     */
     Long getVpcId();
 
-    /**
-     * @param vpcId
-     */
-    void setVpcId(Long vpcId);
     String getVmIp();
-    void setVmIp(String vmIp);
-
 }
diff --git a/api/src/com/cloud/network/PublicIpAddress.java b/api/src/com/cloud/network/PublicIpAddress.java
index d81e9c1ee6c..916d43428e9 100644
--- a/api/src/com/cloud/network/PublicIpAddress.java
+++ b/api/src/com/cloud/network/PublicIpAddress.java
@@ -30,7 +30,4 @@ public interface PublicIpAddress extends ControlledEntity, IpAddress, Vlan, Inte
     public String getNetmask();
 
     public String getGateway();
-
-    @Override
-    public String getVlanTag();
 }
diff --git a/server/src/com/cloud/network/addr/PublicIp.java b/server/src/com/cloud/network/addr/PublicIp.java
index 8217e4e47b9..25e9d308b14 100644
--- a/server/src/com/cloud/network/addr/PublicIp.java
+++ b/server/src/com/cloud/network/addr/PublicIp.java
@@ -194,23 +194,12 @@ public class PublicIp implements PublicIpAddress {
     public boolean getSystem() {
         return _addr.getSystem();
     }
-
-    /* (non-Javadoc)
-     * @see com.cloud.network.IpAddress#getVpcId()
-     */
+	
     @Override
     public Long getVpcId() {
        return _addr.getVpcId();
     }
 
-    /* (non-Javadoc)
-     * @see com.cloud.network.IpAddress#setVpcId(java.lang.Long)
-     */
-    @Override
-    public void setVpcId(Long vpcId) {
-        _addr.setVpcId(vpcId);
-    }
-
     @Override
     public String getIp6Gateway() {
         return _vlan.getIp6Gateway();
@@ -230,9 +219,4 @@ public class PublicIp implements PublicIpAddress {
     public String getVmIp() {
         return _addr.getVmIp();
     }
-
-    @Override
-    public void setVmIp(String vmIp) {
-        _addr.setVmIp(vmIp);
-    }
 }
diff --git a/server/src/com/cloud/network/dao/IPAddressVO.java b/server/src/com/cloud/network/dao/IPAddressVO.java
index 8ce8d3382b2..c5c78e557ae 100644
--- a/server/src/com/cloud/network/dao/IPAddressVO.java
+++ b/server/src/com/cloud/network/dao/IPAddressVO.java
@@ -292,7 +292,6 @@ public class IPAddressVO implements IpAddress {
         return vpcId;
     }
 
-    @Override
     public void setVpcId(Long vpcId) {
         this.vpcId = vpcId;
     }
@@ -302,7 +301,6 @@ public class IPAddressVO implements IpAddress {
         return vmIp;
     }
 
-    @Override
     public void setVmIp(String vmIp) {
         this.vmIp = vmIp;
     }