Removed cruft. cleaned up code