diff --git a/src/hacks/Aimbot.cpp b/src/hacks/Aimbot.cpp
index ef6b0c8f..3ca1b6f8 100644
--- a/src/hacks/Aimbot.cpp
+++ b/src/hacks/Aimbot.cpp
@@ -928,8 +928,11 @@ const Vector &PredictEntity(CachedEntity *entity)
         }
         else if (entity->m_Type() == ENTITY_BUILDING)
         {
-            result = BuildingPrediction(entity, GetBuildingPosition(entity),
-                                        cur_proj_speed, cur_proj_grav);
+            if (cur_proj_grav || cur_proj_grav)
+                result = BuildingPrediction(entity, GetBuildingPosition(entity),
+                                            cur_proj_speed, cur_proj_grav);
+            else
+                result = GetBuildingPosition(entity);
             // Other
         }
         else
diff --git a/src/prediction.cpp b/src/prediction.cpp
index 72d0eb38..f9cf99b9 100644
--- a/src/prediction.cpp
+++ b/src/prediction.cpp
@@ -267,8 +267,6 @@ Vector BuildingPrediction(CachedEntity *building, Vector vec, float speed,
     //        result = SimpleLatencyPrediction(ent, hb);
     //
     //}
-    float latency = g_IEngine->GetNetChannelInfo()->GetLatency(FLOW_OUTGOING) +
-                    g_IEngine->GetNetChannelInfo()->GetLatency(FLOW_INCOMING);
 
     if (speed == 0.0f)
         return Vector();
@@ -288,14 +286,8 @@ Vector BuildingPrediction(CachedEntity *building, Vector vec, float speed,
          steps++, currenttime += ((float) (2 * range) / (float) maxsteps))
     {
         Vector curpos = result;
-        curpos += 0 * currenttime;
-        if (debug_pp_extrapolate)
-        {
-            curpos += 0 * currenttime * latency;
-        }
         if (dtg > 0.0f)
         {
-            curpos.z -= currenttime * currenttime * 400.0f * 0;
             if (curpos.z < result.z - dtg)
                 curpos.z = result.z - dtg;
         }