Removed tmp code