Removed the unnecessary properties(database.xxx and cp.xxx) of infra.properties #86

Please review #86 , and merge to 1.0.x branch.