Removed unneccessary place-holders