Remove collection1; use JNDI for config