Clean up the code. Remove old code #9