removed ntpd hack
openam refactoring