removed unneeded classes
updated stack controller