went delete happy

went delete happy and removed some stuff i shouldn't have..

Signed-off-by: Eric Friesen <efriesen@gmail.com>
Merge branch 'refs/heads/media'