Clean up & prepare for browser testing