Clean code and remove unnecessary things