Cleaned up the code. Got rid of unnecessary items (mostly ones that were
commented out).