Removed other stuff...