removed elpa stuff