removed log stuff