CS fixes, removing fluid interface