removed commented and non longer used attributes