reorganize some analyis area code, remove unused static fx()s