[FIX] Remove unneeded code, Add comments