ECLIPSE-1079 more cleanup of serverbean