Removed useless code + controlled stack