Interface clean ups