Cleaned up unneeded vars. PROXY-14
Merging Development