General post competition code clean up