Removed some variables which weren't really needed.