Removed tmp stuff