Clean up and setup for a5