Cleaning

Doing some cleaning after thesis period.