Refactoring for callback listener
Remove propertie setting file under git