Code cleanup
Fix deleting of movies and music videos
Fixed expiry date checks. Closes #8