Update and removal of unnecessary features