Removed commented and outdated items