Code cleanup. Nothing added, just removed