Tidy up fixtures