Removed more ununsed stuff