Removed public component stuff. Closes #13