diff --git a/loadtime/src/main/java/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java b/loadtime/src/main/java/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
index 9d478633f..d0484f6b4 100644
--- a/loadtime/src/main/java/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
+++ b/loadtime/src/main/java/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
@@ -1008,21 +1008,8 @@ public void flushGeneratedClasses() {
 	 * @param className a slashed classname (e.g. com/foo/Bar)
 	 */
 	public void flushGeneratedClassesFor(String className) {
-		try {
-			String dottedClassName = className.replace('/', '.');
-			String dottedClassNameDollar = dottedClassName+"$"; // to pickup inner classes
-			Iterator<Map.Entry<String, IUnwovenClassFile>> iter = generatedClasses.entrySet().iterator();
-			while (iter.hasNext()) {
-				Entry<String, IUnwovenClassFile> next = iter.next();
-				String existingGeneratedName = next.getKey();
-				if (existingGeneratedName.equals(dottedClassName) ||
-						existingGeneratedName.startsWith(dottedClassNameDollar)) {
-					iter.remove();
-				}
-			}
-		} catch (Throwable t) {
-			new RuntimeException("Unexpected problem tidying up generated classes for "+className,t).printStackTrace();
-		}
+		String dottedClassName = className.replace('/', '.');
+		generatedClasses.remove(dottedClassName);
 	}
 
 	private static final Object lock = new Object();
diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java b/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java
index 966143fc1..ee9c82dd8 100644
--- a/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java
+++ b/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java
@@ -936,7 +936,6 @@ public void acceptResult(IUnwovenClassFile result) {
 							lacache.addGeneratedClassesNames(wovenClass.getClassName(), wovenClass.getBytes(), result.getClassName());
 						}
 
-						generatedClasses.put(className, result);
 						generatedClasses.put(wovenClass.getClassName(), wovenClass);
 						generatedClassHandler.acceptClass(className, null, resultBytes);
 					}