Remove old code/tests that are in commented out. -- Luc Van Oostenryck