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

Please review #86 , and merge to master branch.