Cleanup code. Remove unnecessary tracking of variables for movig platforms.