Code cleaning (AAT::FS removed)