Removed webportal and saved some code for reusage