Commented some things out