Added some unused code