Cleanup, removed some duplicate info