Remove dead code + fix images