Removed some temps