Document code; Remove unneeded code

- Remove uneeded checks