Delete working and code clean up