Streamlining

Cutting out the useless stuff.