Removed some stuff to make life easier.