Remove log statements
Clean up dup code