deleted deprecated, or not 100% sure stuff