removing unused function + beauty