Comments and took out dead code