service cleanup + javadoc
resource cleanup + javadoc