Moved call in admin to method
Removed TODO comment
Removed user field from payment