Further code cleanup. Throwing away unused code