closes #8
Unused includes were removed (beside of ContainerMovieSets)