Some code cleanup. Working on Admin stuff