remove unnecessary vars from data section