Finished removing old vars. Fixes #4.