Commented out some test codes