Did functional clean up and remove used functionality