diff --git a/SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/PokemonClasses/Pokemon.java b/SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/PokemonClasses/Pokemon.java
index 28479f5..974c676 100644
--- a/SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/PokemonClasses/Pokemon.java
+++ b/SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/PokemonClasses/Pokemon.java
@@ -26,32 +26,19 @@ public Pokemon(PokeInfo info, BattleStats stats, ArrayList <Move> moves){
 	
 	public static Pokemon GeneratePokemon(PokeID ID, int lvl){
 		Random rand=new Random();
-		
-		//Pokemon poke= new Pokemon(ID, lvl);
-		
 		PokedexEntry entry=new PokedexEntry();
 		entry=FokemonUI.getPokedex().getPokeMap().get(ID);
 		boolean gender;
 		if(rand.nextInt()%2==0)gender=false;
 		else gender=true;
-		entry.getPokeID();
-		TempBattle.getUser().getPlayerID();
-		entry.getPokeName();
-		entry.getPokeName();
-		entry.getType();
 		PokeInfo information=new PokeInfo(entry.getPokeID(),TempBattle.getUser().getPlayerID(),entry.getPokeName(),entry.getPokeName(),gender,entry.getType(),lvl,0);
-		
 		Move move1=MoveDataBase.generateMove(MoveName.Tackle);
 		ArrayList<Move>moves=new ArrayList<Move>();
-		
 		moves.add(move1);
 		BattleStats battleStats=new BattleStats(0,0,0,0,0,0, 0, Status.NRM,entry.getBaseXP(),entry.getBaseStats(),entry.getEVyield());
 		Pokemon pokemon=new Pokemon(information, battleStats, moves);
-		
 		pokemon.UpdateStats();
 		pokemon.getStats().setCurHp(pokemon.getStats().getMaxHp());
-		
-		
 		return pokemon;