Removed commented out code.
Use dependedncy managenment.