Removing debug messages, trying some profiling