Remove development messages, add timing