Comment out hacky code