updated elpa and did some cleaning