[CLEANUP] Remove not existing AOP stuff from fluid