Removed some more nonsense