refactor- remove container properties