Little fix and removal of old content