Remove testing/obsolete code