Warnings fixed and unneeded classes removed as they were previously used
for testing.