[BUGFIX] Clean-up responsibilities of FAL classes