Remove redundant poc for timing
Fix bugs