Removed toying-around code