We have several clutters in the code, now's a good time to clean up the entire codebase so that we can progress faster in the future.