Remove old files, pipeline so on
improvements?