Code clean up changes, removing few unncessary values.