finally cleaned up and got a hold on custom users