removal of unused variables (IDs)
Minor Fixes and clean up
Merge https://github.com/dejaime/SDL_vault