Cleanup comp unused vars