Deleted some commented stuff