Cleaning Up old methods