Added a few comments, removed unused forms