Code cleanup for ActiveField