Took away a few things

Some functions are commneted.