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

Please review #89 , and merge to master branch.