Clean up and removal of variables no longer needed
Clean up and removal of variables no longer needed

xuzetan/gemini,arq5x/gemini,bgruening/gemini,bpow/gemini,bw2/gemini,xuzetan/gemini,brentp/gemini,heuermh/gemini,brentp/gemini,udp3f/gemini,xuzetan/gemini,arq5x/gemini,udp3f/gemini,brentp/gemini,brentp/gemini,bpow/gemini,bw2/gemini,heuermh/gemini,heuermh/gemini,bpow/gemini,bgruening/gemini,bw2/gemini,xuzetan/gemini,arq5x/gemini,bw2/gemini,arq5x/gemini,heuermh/gemini,bgruening/gemini,udp3f/gemini,udp3f/gemini,bgruening/gemini,bpow/gemini