Remove return null statements
Remove video prefix