asset controller code cleanup