cleanup + separate admin to different class