PHP clean up + Dashboard clean up