Code cleanup / sync code between eSpace and fez