Removed ISSUE_168 #defines