Core: Improved parameter parsing.
Core: Removed obsolete code.