Removed with-*put-from functions for now