Major cleanup, removed test item