Cleaned the code a bit, removed parameter handling, which was not
used