post-demo: Tidy up the code a little bit Part 1

Project was retrofitted from a movies example into fees demo. So removing some references to movies
post-demo: Tidy up the code a little bit Part 2

Remove additional references to movies/genre