Removed unnecessary stuff from decoder