Cleaned up common (removed ntp related items)