minor changes and deleted unused class
fixed that forms issue