Removed some stuff to re-commit