Clean up @Thog92 's garbage