Removed unneccesary attributes. Optimizations.