diff --git a/briar-api/src/net/sf/briar/api/TransportConfig.java b/briar-api/src/net/sf/briar/api/TransportConfig.java
index da2c8bbc0f413d7ba399544a05927c277c0defe0..45e5ce09c743d45789b15ea3216fe4a3a978460b 100644
--- a/briar-api/src/net/sf/briar/api/TransportConfig.java
+++ b/briar-api/src/net/sf/briar/api/TransportConfig.java
@@ -11,7 +11,5 @@ public class TransportConfig extends Hashtable<String, String> {
 		super(c);
 	}
 
-	public TransportConfig() {
-		super();
-	}
+	public TransportConfig() {}
 }
diff --git a/briar-api/src/net/sf/briar/api/TransportProperties.java b/briar-api/src/net/sf/briar/api/TransportProperties.java
index df87c7d3aa49526c62ddbd2b3f81603bd1abc4bd..cdce2af433908468e87b46e00c8815d3e478fc8d 100644
--- a/briar-api/src/net/sf/briar/api/TransportProperties.java
+++ b/briar-api/src/net/sf/briar/api/TransportProperties.java
@@ -11,7 +11,5 @@ public class TransportProperties extends Hashtable<String, String> {
 		super(p);
 	}
 
-	public TransportProperties() {
-		super();
-	}
+	public TransportProperties() {}
 }
diff --git a/briar-api/src/net/sf/briar/api/db/DbException.java b/briar-api/src/net/sf/briar/api/db/DbException.java
index 3ad5030a9e522af3daf5b9773cc565c62f926cf0..0a200a6355c9cd0e9c851404287fc619ea09a90c 100644
--- a/briar-api/src/net/sf/briar/api/db/DbException.java
+++ b/briar-api/src/net/sf/briar/api/db/DbException.java
@@ -4,9 +4,7 @@ public class DbException extends Exception {
 
 	private static final long serialVersionUID = 3706581789209939441L;
 
-	public DbException() {
-		super();
-	}
+	public DbException() {}
 
 	public DbException(Throwable t) {
 		super(t);
diff --git a/briar-tests/src/net/sf/briar/BriarTestCase.java b/briar-tests/src/net/sf/briar/BriarTestCase.java
index 171b620cde70768e3cfd44f57d30311acddeefd7..c2635e1172a90c3e4de300ba5b261fffde99a2b0 100644
--- a/briar-tests/src/net/sf/briar/BriarTestCase.java
+++ b/briar-tests/src/net/sf/briar/BriarTestCase.java
@@ -7,7 +7,6 @@ import junit.framework.TestCase;
 public abstract class BriarTestCase extends TestCase {
 
 	public BriarTestCase() {
-		super();
 		// Ensure exceptions thrown on worker threads cause tests to fail
 		UncaughtExceptionHandler fail = new UncaughtExceptionHandler() {
 			public void uncaughtException(Thread thread, Throwable throwable) {
diff --git a/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java b/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java
index 7d87dd82d7c5f46740167663cadfb430107044b3..2eaed4147438cb14bce23edc772d30ab120e74bf 100644
--- a/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java
+++ b/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java
@@ -77,7 +77,6 @@ public class ProtocolIntegrationTest extends BriarTestCase {
 	private final TransportProperties transportProperties;
 
 	public ProtocolIntegrationTest() throws Exception {
-		super();
 		Injector i = Guice.createInjector(new TestDatabaseModule(),
 				new TestLifecycleModule(), new TestUiModule(),
 				new ClockModule(), new CryptoModule(), new DatabaseModule(),
diff --git a/briar-tests/src/net/sf/briar/crypto/CounterModeTest.java b/briar-tests/src/net/sf/briar/crypto/CounterModeTest.java
index 96cde200146d6cbfd3ee34df429afa8b525e65b3..d6c16f4666a3cdb4b3848aa5ad8f8d8f485a5707 100644
--- a/briar-tests/src/net/sf/briar/crypto/CounterModeTest.java
+++ b/briar-tests/src/net/sf/briar/crypto/CounterModeTest.java
@@ -29,7 +29,6 @@ public class CounterModeTest extends BriarTestCase {
 	private final SecretKeySpec key;
 
 	public CounterModeTest() {
-		super();
 		Security.addProvider(new BouncyCastleProvider());
 		random = new SecureRandom();
 		keyBytes = new byte[KEY_SIZE_BYTES];
diff --git a/briar-tests/src/net/sf/briar/crypto/KeyDerivationTest.java b/briar-tests/src/net/sf/briar/crypto/KeyDerivationTest.java
index b05f536a45430b94af0e81c42a79c68b2720c6a4..f3c568cec86d8d69cf0e6d5ac0cc979d55b75d2b 100644
--- a/briar-tests/src/net/sf/briar/crypto/KeyDerivationTest.java
+++ b/briar-tests/src/net/sf/briar/crypto/KeyDerivationTest.java
@@ -17,7 +17,6 @@ public class KeyDerivationTest extends BriarTestCase {
 	private final byte[] secret;
 
 	public KeyDerivationTest() {
-		super();
 		crypto = new CryptoComponentImpl();
 		secret = new byte[32];
 		new Random().nextBytes(secret);
diff --git a/briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java b/briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java
index 02e69ad48b2fa177303099038131b728d9364398..3df36ac68248bb30a3a9f8f7195d7283661466eb 100644
--- a/briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java
+++ b/briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java
@@ -79,7 +79,6 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
 	protected final TemporarySecret temporarySecret;
 
 	public DatabaseComponentTest() {
-		super();
 		groupId = new GroupId(TestUtils.getRandomId());
 		restrictedGroupId = new GroupId(TestUtils.getRandomId());
 		group = new Group(groupId, "Group name", null);
diff --git a/briar-tests/src/net/sf/briar/db/H2DatabaseTest.java b/briar-tests/src/net/sf/briar/db/H2DatabaseTest.java
index 632f0cb72e163a80e7f3cf6ce05622a490d2f630..0757dfa1034f918b9aef98511d86673978c35347 100644
--- a/briar-tests/src/net/sf/briar/db/H2DatabaseTest.java
+++ b/briar-tests/src/net/sf/briar/db/H2DatabaseTest.java
@@ -69,7 +69,6 @@ public class H2DatabaseTest extends BriarTestCase {
 	private final ContactId contactId;
 
 	public H2DatabaseTest() throws Exception {
-		super();
 		groupId = new GroupId(TestUtils.getRandomId());
 		group = new Group(groupId, "Group name", null);
 		authorId = new AuthorId(TestUtils.getRandomId());
diff --git a/briar-tests/src/net/sf/briar/messaging/PacketReaderImplTest.java b/briar-tests/src/net/sf/briar/messaging/PacketReaderImplTest.java
index c32db9c0c9f31814696fded7fc60cedb87dd8649..92a3c7ce2fa1876993266354b3b27fbfab7ec208 100644
--- a/briar-tests/src/net/sf/briar/messaging/PacketReaderImplTest.java
+++ b/briar-tests/src/net/sf/briar/messaging/PacketReaderImplTest.java
@@ -33,7 +33,6 @@ public class PacketReaderImplTest extends BriarTestCase {
 	private final WriterFactory writerFactory;
 
 	public PacketReaderImplTest() throws Exception {
-		super();
 		Injector i = Guice.createInjector(new SerialModule());
 		serial = i.getInstance(SerialComponent.class);
 		readerFactory = i.getInstance(ReaderFactory.class);
diff --git a/briar-tests/src/net/sf/briar/messaging/PacketWriterImplTest.java b/briar-tests/src/net/sf/briar/messaging/PacketWriterImplTest.java
index 2ca4e40be0024325a8930757ca56cb4ca394ba95..c59587185f7ba758d6b784620f1a5ea059f782e9 100644
--- a/briar-tests/src/net/sf/briar/messaging/PacketWriterImplTest.java
+++ b/briar-tests/src/net/sf/briar/messaging/PacketWriterImplTest.java
@@ -33,7 +33,6 @@ public class PacketWriterImplTest extends BriarTestCase {
 	private final WriterFactory writerFactory;
 
 	public PacketWriterImplTest() {
-		super();
 		Injector i = Guice.createInjector(new TestDatabaseModule(),
 				new TestLifecycleModule(), new ClockModule(),
 				new CryptoModule(), new DatabaseModule(), new MessagingModule(),
diff --git a/briar-tests/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnectionTest.java b/briar-tests/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnectionTest.java
index 6dbf36984cadfd8e8bdee1b9381c542b5bb6fe84..3021e53923c7fcdcebfa1d02783a21e98a085c5c 100644
--- a/briar-tests/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnectionTest.java
+++ b/briar-tests/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnectionTest.java
@@ -57,7 +57,6 @@ public class OutgoingSimplexConnectionTest extends BriarTestCase {
 	private final byte[] secret;
 
 	public OutgoingSimplexConnectionTest() {
-		super();
 		context = new Mockery();
 		db = context.mock(DatabaseComponent.class);
 		Module testModule = new AbstractModule() {
diff --git a/briar-tests/src/net/sf/briar/messaging/simplex/SimplexMessagingIntegrationTest.java b/briar-tests/src/net/sf/briar/messaging/simplex/SimplexMessagingIntegrationTest.java
index fab66c510bf1971ead3cf1abf595fea4a8ae8276..99047990632c19f4b32365810c776ea19949db26 100644
--- a/briar-tests/src/net/sf/briar/messaging/simplex/SimplexMessagingIntegrationTest.java
+++ b/briar-tests/src/net/sf/briar/messaging/simplex/SimplexMessagingIntegrationTest.java
@@ -63,7 +63,6 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
 	private Injector alice, bob;
 
 	public SimplexMessagingIntegrationTest() throws Exception {
-		super();
 		transportId = new TransportId(TestUtils.getRandomId());
 		// Create matching secrets for Alice and Bob
 		initialSecret = new byte[32];
diff --git a/briar-tests/src/net/sf/briar/transport/ConnectionRegistryImplTest.java b/briar-tests/src/net/sf/briar/transport/ConnectionRegistryImplTest.java
index 1e118bf7da395f4883a3431c8b2768d1126f2162..647d586a6fd0efcc8ad1ef7f18642e7762a7c906 100644
--- a/briar-tests/src/net/sf/briar/transport/ConnectionRegistryImplTest.java
+++ b/briar-tests/src/net/sf/briar/transport/ConnectionRegistryImplTest.java
@@ -17,7 +17,6 @@ public class ConnectionRegistryImplTest extends BriarTestCase {
 	private final TransportId transportId, transportId1;
 
 	public ConnectionRegistryImplTest() {
-		super();
 		contactId = new ContactId(1);
 		contactId1 = new ContactId(2);
 		transportId = new TransportId(TestUtils.getRandomId());
diff --git a/briar-tests/src/net/sf/briar/transport/IncomingEncryptionLayerTest.java b/briar-tests/src/net/sf/briar/transport/IncomingEncryptionLayerTest.java
index 952862e88bd37ed38fe8966946ea948fd4dde9c5..af3edcc464c9d6a4e365c6278b854269b1d44ec1 100644
--- a/briar-tests/src/net/sf/briar/transport/IncomingEncryptionLayerTest.java
+++ b/briar-tests/src/net/sf/briar/transport/IncomingEncryptionLayerTest.java
@@ -34,7 +34,6 @@ public class IncomingEncryptionLayerTest extends BriarTestCase {
 	private final ErasableKey frameKey;
 
 	public IncomingEncryptionLayerTest() {
-		super();
 		Injector i = Guice.createInjector(new CryptoModule(),
 				new TestLifecycleModule());
 		crypto = i.getInstance(CryptoComponent.class);
diff --git a/briar-tests/src/net/sf/briar/transport/OutgoingEncryptionLayerTest.java b/briar-tests/src/net/sf/briar/transport/OutgoingEncryptionLayerTest.java
index 94797d389c52ec67c26695540804ee7988cf1d98..648c3c0da295e17218e1575e50adff465cbb69c3 100644
--- a/briar-tests/src/net/sf/briar/transport/OutgoingEncryptionLayerTest.java
+++ b/briar-tests/src/net/sf/briar/transport/OutgoingEncryptionLayerTest.java
@@ -34,7 +34,6 @@ public class OutgoingEncryptionLayerTest extends BriarTestCase {
 	private final byte[] tag;
 
 	public OutgoingEncryptionLayerTest() {
-		super();
 		Injector i = Guice.createInjector(new CryptoModule(),
 				new TestLifecycleModule());
 		crypto = i.getInstance(CryptoComponent.class);
diff --git a/briar-tests/src/net/sf/briar/transport/TransportIntegrationTest.java b/briar-tests/src/net/sf/briar/transport/TransportIntegrationTest.java
index 5e77a768fe1159c43ea402fc271f09fee56a96e9..8ef8c3b5dc7db784bfa56afe34ee0c8c6a042ca6 100644
--- a/briar-tests/src/net/sf/briar/transport/TransportIntegrationTest.java
+++ b/briar-tests/src/net/sf/briar/transport/TransportIntegrationTest.java
@@ -44,7 +44,6 @@ public class TransportIntegrationTest extends BriarTestCase {
 	private final ErasableKey frameKey;
 
 	public TransportIntegrationTest() {
-		super();
 		Module testModule = new AbstractModule() {
 			public void configure() {
 				bind(ConnectionWriterFactory.class).to(