cleanup of admin part
cleanup of frontend code