Added performance logging and removed those FIX-ME's that we are not going to implement