Integration into Old Portal: removed some junk code from old version