Removed some uselessness