code cleanup and reformatting
remove unused fixtures