Removed some dead code. Need to figure out deserialization error