Cleanup of the Core.

- Removed un-needed methods, unified parameters.
Signed-off-by: Chris Sanders <zidane@outlook.com>