Finalizing

Chanages.. deleted unused forms and controls