Remove test code
Update config