Initial commit
Removed unused parameters