Decrepating functions not longer needed, made some code shorter