Clean code, removed unneeded code