Cleaning up after peacocks #18