stop container feature & code cleanup