Benjamin, fix for eApp and remove development code