Removed Commented-out code from Survive-Java-Persistence and API