Fixed bug
Removed old unused module
Fixed warnings reported by PyDev