Got rid of uneccessary attributes