Removed deprecated functions and input.replace fix