Cleaned up unwanted code