Removed temp stuff