Simplify function names; disable image() function