Commented out some code to fix compilation issues