Removed some temporary code