Add portlet-info
Remove old cruft