Interfaces cleanups