Just some general suggestions for code cleanup

Don't see what this is doing.  This value is never read.  Why do you have two keys for this?