Clean-up Imaging + Bugfix for auth decorators