Removed old carrier wave variables