Removed warning by not using deprecated methods
Disable selecting videos when photos are selected and the other way round.
Code cleanup