Updated parsing/removed unused attributes