Merged in biernacki/ramses (pull request #250)
Cleaning unused variables in amr
Cleaning experimental patch
Reverting changes/bug in movies
Cleaning unused variables in amr
Cleaning experimental patch
Reverting changes/bug in movies