Cleanup comments, remove unnecessary delays