Removed many test code