Admin section started with some cleanup of debug too