Removed some dead D7 code
Settings Form added, installation issue fixed
Merged