Spare code clean up