Remove two unused attributes; minor cleanup